bitkeeper revision 1.1159.258.112 (4277a730mvnFSFXrxJpVRNk8hjD4Vg)

[PATCH] Mkbuildtree little fix

Hi, here is a really small fix for mkbuildtree.

With my 'find' version [1], I get many of these warning when using mkbuildtree:

find: warning: you have specified the -maxdepth option after a
non-option argument -type, but options are not positional (-maxdepth
affects tests specified before it as well as those specified after it).
Please specify options before other arguments.

My patch just correct the ordering of the options, it should be
harmless, but I didn't test with other versions of find.

Regards

[1] find --version
GNU find version 4.2.20
Features enabled: D_TYPE O_NOFOLLOW(enabled)

xen-unstable-mkbuildtree-find-maxpath.patch:

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index eff426464de6013491e6cd1c16862655874d12fe..90b505243e02261041433a54d838e0daaee047f4 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -73,3 +73,4 @@ tw275@striker.cl.cam.ac.uk
 vh249@airwolf.cl.cam.ac.uk
 vh249@arcadians.cl.cam.ac.uk
 xenbk@gandalf.hpl.hp.com
+ydroneaud@mandriva.com

diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree
index f72b2cd7b1783af5202860a650569b86b9226b0b..acf4fb2f85f2b6fe085fc1ecbedff361b760ba13 100755 (executable)
--- a/linux-2.4.29-xen-sparse/mkbuildtree
+++ b/linux-2.4.29-xen-sparse/mkbuildtree
@@ -66,7 +66,7 @@ relative_lndir ()
     (
     cd $i
     pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'`
-    for j in `find . -type f -o -type l -maxdepth 1`; do
+    for j in `find . -maxdepth 1 -type f -o -type l`; do
       ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j
     done
     )

diff --git a/linux-2.6.11-xen-sparse/mkbuildtree b/linux-2.6.11-xen-sparse/mkbuildtree
index 8ab2d42a7c85c6dcb771c654d2ef66ac3236f5c7..3556506d6da28a89b7a51a066de740127dc41323 100755 (executable)
--- a/linux-2.6.11-xen-sparse/mkbuildtree
+++ b/linux-2.6.11-xen-sparse/mkbuildtree
@@ -66,7 +66,7 @@ relative_lndir ()
     (
     cd $i
     pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'`
-    for j in `find . -type f -o -type l -maxdepth 1`; do
+    for j in `find . -maxdepth 1 -type f -o -type l`; do
       ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j
     done
     )